Check for RENDER before trying to use it... XRenderFindFormat() prints

Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
	RENDER before trying to use it... XRenderFindFormat() prints
	warnings if called when extension isn't present.

diff --git a/ChangeLog b/ChangeLog
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 79c7e6f19d5e4d5ef22edb404a0379b2703dfb0d..ac680b51b3d1ba5c632009062d06795c4933480d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jan  9 10:20:16 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkdrawable-x11.c gdk/x11/gdkgc-c11.c: Check for
+       RENDER before trying to use it... XRenderFindFormat() prints
+       warnings if called when extension isn't present.
+
 Wed Jan  9 15:20:40 2002  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_parent_set): update the accel

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index ad4c97096b7f8feb23cb8aebffde2d1ff1ca706d..89c7661ff41b3d088f02f554525b7afddf8adb1e 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -1,4 +1,4 @@
-/* GDK - The GIMP Drawing Kit
+/* GIMP Drawing Kit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -238,6 +238,9 @@ gdk_x11_drawable_get_picture (GdkDrawable *drawable)
 {
   GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable);
 
+  if (!_gdk_x11_have_render ())
+    return None;
+  
   if (impl->picture == None)
     {
       GdkVisual *visual = gdk_drawable_get_visual (drawable);
@@ -802,12 +805,14 @@ select_format (Display            *xdisplay,
               XRenderPictFormat **mask)
 {
   XRenderPictFormat pf;
-  
 
-/* Look for a 32-bit xRGB and Axxx formats that exactly match the
- * in memory data format. We can use them as pixmap and mask
- * to deal with non-premultiplied data.
- */
+  if (!_gdk_x11_have_render ())
+    return FORMAT_NONE;
+  
+  /* Look for a 32-bit xRGB and Axxx formats that exactly match the
+   * in memory data format. We can use them as pixmap and mask
+   * to deal with non-premultiplied data.
+   */
 
   pf.type = PictTypeDirect;
   pf.depth = 32;

diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index b703b7e3b9a5f1de1fe4779275c7de74b653cfc3..3605718e13f84d8889d7f66fecae3820a827e3cd 100644 (file)
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -804,6 +804,9 @@ _gdk_x11_gc_get_fg_picture (GdkGC *gc)
   
   g_return_val_if_fail (GDK_IS_GC_X11 (gc), None);
 
+  if (!_gdk_x11_have_render ())
+    return None;
+
   x11_gc = GDK_GC_X11 (gc);
 
   if (x11_gc->fg_picture == None)